Additional fix for OPENAM-4453