Fixes #28 bad code