Fixing scroll bug