Removed buffer length restriction