Fixed updating issue