fixed #845