fix for " , & , < and >