[Fixes #5306]