Bug fix with Calendar Custom Event definition