Fixed bug for calendar HP refs #2206