Fix issue caused by my first fix to scrollbar issue