Trying to fix hang issue v2