fixes #626