Fixed stupid bug plaguing first version