Fixes #411