CGIV-1029 don't use notify