Simplify logic and short circuit correctly