fixed issue#118