fixed #531