Typo performances optimization