more fix on scroll