Fixes issue with #124

My previous PR undid a couple things of #124 by mistake. This fixes that, and fixes another typo.