char set to Peter Griffen
merge fixed