fixed #1981