Fixed small bug regarding scroll