fixed #960