Temp fix for char selection
Merging something..