new attempt at getting rid of stalled analysis