fix added for different server configurations