Fixes #2747