Crash Fix on tablets