Fix for EZP-20906.