[API] Is now more false tolerant