fixes #1360