Fix _ or space issue