Another OCD Josh fix