updated for 1.6.4-R0.1