Fix android compatibility