Added a default value for short_circuit var if none is specified