EZP-21324: Attempt to fix error on postgresql