Bug/fix latest upgrade