Fixes #9

Had a long time syncing the fork and upstreams :laughing: