removed redundant buffer access