Fix issue #22 lol