Fixes #6591