Fix one problem with the previous patch and add a comment.