Make 07 and 08 work.