Fixes #6187