Did this start after some refactoring, by chance?