Better potential fix for Nexus 7