fix #582