fix for parsing and characters mapping