Fixes #408