fixes #2683