Fixes #7903