Fixes #6189