Fixed apocalyptic bug - fixes #109

- At least, I hope it does.