Fix android bug