fix 0.6.4 and below