Android fix (8/24)

Android fix