android fix + export