fix calendar issue (Production Complie)