Fix server creation issue