Fixes #2710