Fix ,  and