Fixed issue with Crash while scrolling