Fixed #531