Updated for 1.6.4-R2.1