Another OCD fix