fixes #488 service fee waiver.