Add leap short-circuit