Fixed non-standard character issues