Fix #15
-Note that this fix wasn't tested, but a previous fix that was just placed in a different area worked (but added a different bug)