Fixing waiver calculation