Bugfix for non-UDB enabled servers