Almost fixed object reference.
merged w lesslie
no change