Reinforcement fix - squash this into earlier patch.