Fixing #7253 again
Fixing #7253 again