fix calendar is not saving custom properties