Fixes #5. Not my favourite but for the time being.