fixes #559