Fix to properly look ahead next moves