Corrected a small bugs: