fixes #1096