Continue fix the previous bug