fixed #73, fixed #75, fixed #76