Fix previous bug