issue 2613: creating the switch and changing the inconsistent comparison to basop macro