Compatibility with newer library versions