Fix for swiping issue