bugfix - SERVER_NAME usage causing unwanted impact