Ensure compatibility with 3.6