Fixes #613