Fixing infinite slide bug
merge