fixed for remove timeout