fixes #560