Issue 7461

Fixes issue #7461