Fixes TRex

Closes #18