Fix 9157

See #9157