Bugfix #31

I WENT CRAZY
BUT NOW
I FEEL FINE
ITS FANTABULOUS