[WIP] Fix/crash when scrolling