Final fix on android