Fixed based on PR comments.