Added detection of independent calls.