more attempts to fix android issues