Waiver fix