Solved short stub last scheduler as well