Some minor bug is fixed