removed is_android was causing problems