changed thread.sleep for test purpose
merge fix