fixed #1713