Android fix (22/24)

Android fix