Fix of replacing all ToString to tostring