Fix previous bug in a different way