Fix bug with recent Android