udpated fix