Fixes #15 but the fix is not ideal