issue 2616: Creating the switch and changing conditions to exclude the boundary value.