Actually fixed the issue that was not fixed in the previous commit.