Fixes #626