MODE-2286 Minor change to make recent change more efficient