Fixes flag collision