Connection Bug Fix ==> Wait until connection is available