Workaround to avoid hangs while testing