Fix and close #90.  Fixed bug with schedules