Making it 4.2 friendly