addresses #7580