Fixing Connection template