Fixes #2941