fixed #69, fixed #75