Fixes #412