minor change to improve CSW client according to Tom Kralidis