fixed #805