Small Android improvement