Working on fixing for Android