Fix bitwise matching