Pending problems with BitType
TODO test and fix