Fixed the same issue for schedule