fixes #2740