Fix a nasty tuple bug