fixing more