fixes #2635