Fixed the oddness of issue #5 yay!