Hot fix Android

Hot fix for for Android