EZP-23153: fixed: simplified return