Fix mistakes from #81 (Im looking at you, JOPHESTUS)