fixed #75
fixed #73