Trying to fix hang issue