Fixes #2744