Trying to fix hang issue v3