Connection: fix variable order