Ensure compatibility with completion