Another change to prevent from crashing on Galaxy Tab 10.1