Fixed problem with bit manipulation.  I think, maybe.