Fix logical test blocks do not clone properly. See issue #36