MODE-1900 - Added small code optimization, as per review.