Final fix for scroll