fixed #844