Fix first run regression

Fixed a regression caused by the last commit.