Make it 1.9 compatible