Fix unflag form bug