Added buffer limit