CAAERS-6571: Fix for Multiple Amends.