Fix scroll bug leading to constraint error