Updated minor bug issue. But the previous bug still exist.