Fix BiFa
Fix force discard