(Intra) Fix application freeze