Fixes Bug #244 (Crash on Galaxy Tab 10.1) part 2