Fixes #18 hopefully :)