Fix issue with lazy threads