Fix screen x-scrolling, tag v2.4