remove the @ and change the comment from [8107] (closes: #2122)