fixes #2859