Fixing app crash on fast swiping

Fixes #464