[+] be more backwards compatible