Merge pull request #622 from antmicro/fix_connectors