fix for timeout and threaded customise