Bug #8211 corrected