Fix #531