Fix for OpenAM-2338