dochoa substituted
Fix problem with scroll