Fixes #7939