Fixes #413