FIX #11 (MR)

MAY170683

Mac is out for answers.