issue: 2446 refining conditional statements that were mistakenly harmonized -...

issue: 2446 refining conditional statements that were mistakenly harmonized - reverting one condition at the end of the function