Tidy-up previous change