Dev Fixed update issue