Fixed the previous bug