Added PAXEXAM-595 workaround.