fix for AGPUSH-553