Fixed bug introduce by previous commit