FIX: second attempt to fix horizontal scrolling