#109 Native Android fix