fix #issue127