1.6.2 compatible-2

(Untested)