Fixes #5732