Fix scheduling issue