Fixed problem w/clearing after date