Fixed #8111241113124 && #8111241113126