[Evgeny, Luis] fixed Connector