Fix for scrolling being wonky