Made the detection of disclosure calculations more robust