GPRESOURCES-153 fixed