Buffer bugfix Connector bugfix