try to fix #193 in v1.x