Android fix (24/24)

Android fix