Add short circuit vars