Fixed escape issue