Fixes #5502