Additional fix for OPENAM-4453
Additional fix for OPENAM-4453