Improvements to previous fix for #626.