fixed #96
fixed #91