Fixed the issues CAAERS-6478 and CAAERS-6476