Fixing an issue caused with the last commit.