AID-36 Change to 1.9 syntax from 2.0 to be compatible with Checkpoint.