Making it 1.6 compatible