Fixes #36
Merge pull request #37 from JavaJumperStudios/jjj1_bugfix#36

Fixes #36