Fixes #9482