fixed #81
fixed #81