Fixes #407