Fixes #7 some commits ago :P