BZ-10007 fixed redundant server call