Fixed a regression in the last commit