Bug fix about scrolling wrong location. The main point is to use the UPDATED geometry...