Adding a fix for buffered find operations