fixed #2220