fix bug introduce by massive change