fixes #611