1.6.2 compatable

(untested)