I hate myself so much. Fixes #61