Transfix

This fixes the test and I merged the master into this so that it applies to master cleanly.