Fixes #4