Correct update() ! Close #7