fix #531