More robust fix for mock server