alter logic to make use of short path evaluation