Fix crash and fling