fixed " handling