Android Issues - Possible fix *Updated*