Fixes #614