Some compatibility with 24.4 work