EZP-21226 : handle location