Fix a bug reintroduced by fixing the last bug