Bug fix: Cal. event ordering