second part of fix for #1774, containing files missed in #1775
Signed-off-by: Timothy Gu <timothygu99@gmail.com>