fixed #1592