issue fixes after the apk sharing