Small fix to improve support for the new server