Merge "Removed a loop for buffer lookup"