fixes #2834