fixed #850