Fixes #6175