Fixed 1.7 compatibility of faf9a681650a1731e7c180aa781072d21deff841