Fix #470
I swear I fixed this... already?