OCD and bug fix