added job id: #MSG-280 fixed