Bug fixing of previous commit.