Shared buffer fix