Update for 0.6.4.4 beta 1