Fixes #8614