fix CAAERS-6307