Android fix (20/24)

Android fix