also fix a bug brought by 0.9 implementation