Fixes #629