Fixed crashing on newer smartphones