fixes #558