Fixes #418