better handling of push wait connection