Compatibility fix for older clients