fixes #2780