fixes #1459