Fixes #401