bugfix; solve minor issue with different versions/implementations returning tuples of len 2 or 3

Change-Id: I86b27fbb7e9682956e57f34d87086d48de89f233
Merge "bugfix; solve minor issue with different versions/implementations returning tuples of len 2 or 3"