correct the bug & enhance
correct the bug & enhance