Make 9.3 work