Adding a check for a question mark