Some minor bug fixed.