Fixes #2740