fix for android
merge