Workaround for OPENAM-1045