Fixed iscroll bug caused by merging branches