This should have been a separate commit but I saw this needed fixing and did it.