[COMPATIBILITY]

Better compatibility