Fix OPENAM-4453