Fixes

To deal with new tuple