fixed #1584