Fixes #2