Fix Android & Macro