NX-526: Small optimization