Tested and fixed previous commit.