Fix for OPENAM-2282