Fixed preformance issue with marking INCOMPLETES