LAL-1116 fix