Fixes #568