Fixing Waiver Submission