FIX: slowdown and app freezing were caused by accidental closures