Fixed a regression from a couple weeks ago