Fixing #7253 again