FIX: avoid milestones in margin calculation