LUN-1869: Small improvement