already in progress in #736 but making a separate issue to put on the project board to remind me to actually fix
already in progress in #736 but making a separate issue to put on the project board to remind me to actually fix