fix the previous bug