Properly fix the previous bug