Fix for indexoutofbounds error. And apk.