fix calendar return empty object instead of null