Bitmask fix