Correct upfront amount calculation