Android fix #2