Fixed problem with component bit-masking