I have the same problem as well also, after the step, there is 1 card that is up too high before the waterfall, and you can see the card above the selection. Then when I go to waterfall the remaining cards, the cards waterfall over the*card* and then, obviously no control. lol
Any tips for this...