Cameron Cawley - 6 days ago

Attached a second revision of the patch to cover an additional case that was missed in the initial patch.