fixes #2709