restored android 9+ compatibility