fixes #627