Fixes #619