fixed #1764