Changed client prefix wait to TIMEOUT_SHORT - at least 5 seconds seemed sometimes not enough if system was loaded enough.