Possible android fix