Fix vu scheduling, close #2138