Assure compatibility with version 5.10