Flag redirect fix 2