I think you're right.  But before you bother fixing it, test the  
newer version of Schedule.java out on CVS.  Here it is: