Fixed mismatch code