temp fix for cascade into fling bug