Corrected for null char