Use bitfield properly