Made 1.9 compatible