Fixed crashing apps