Made matching string a buffer instead