Fixed the CAAERS-6414 and CAAERS-6412.