for reals this time, I fixed the android clusterfuck