Fixes #5131