Fix update (part 8 unstable)