Connector#dispatch must be adjusted