fix calendar field handling.