Fixes #2737