Fixing wrap_comment change