#465 fixing apr recalculation