fix TU
need more work on bitfields