Fixed an issue caused by one of my previous changes and another PR.