support 0.6.5