fixed slider bug
Merge branch 'chris'