Added enclosing characters checking