Fix for OPENAM-3946