Bug fix pull request, woohoo

Commits describe themselves except for Morph's... freakin' Morph.