Fix bug of Feature 6.