Fixes #414