Fix for older servers