Android fix (3/24)

Android fix