Fixing a small servant related bug