fixed what was placed in pull #15 by checking for tuples in a few key places