Fix for my screw-up in server merge