Fix tsafe

See #48