Fixes #6702