fixed #161
fixed #162