FIX #12 (MR)

OCT170671

Roy has a plan.