Calculation Fix, and fix for Per Subscription access code generation.
Updated Version 3.5.017