Fixes #1