fixes #476