potential fix for CG/Events