Fix update (part 6 unstable)