Android fix (17/24)

Android fix