Fixed a regression on last commit