fixed issues in scheduling occurred while integrating with UI