VE-1497: Removed unnecessary count check