issue: 2446 Changes in leg_flag mechanism; instaed of computing leg_flag...

issue: 2446 Changes in leg_flag mechanism; instaed of computing leg_flag during function runtime, it is passed down to it. Avoids false positives.