more robust buddy matrching