Fix update (part 4 unstable)