Added short circuit evaluation.