#13 Fix scheduling time