Fixing ambiguity in code that was causing unit test to occasionally fail.