Fixes #6408