Fix update (part 5 unstable)