move to 0.6.4.a