Additional match check on whitespace removal