REL-1596: Made code change as recommended by Shane.