Fix based on Raymond's feedback.