Fixes #1

No additional comments (so far :)