Fix crash for new version of android os