Committed a fix for 7731, suggested by mnehauser.