Fix for CAAERS-6612