Fixing #7253