Increased compatibility with old apaches