Made it 1.8 compatible