Tried to fix an Andriod bug