EZP-21293: Made sure we are not limited to one segment