Attempted to fix hang again