Schedule crash fix