Fix based on Randy's feedback.