Partial fix #10

Works for everything besides Products (Tuples).