#82, fixed #78