Fixing issues with the previous commit.