fixing buffer reordering issues