fized bug in v1.8