=BG= minor - avoid if statement to make code clearer.
Merge pull request #2083 from bguiz/patch-7

=BG= minor - avoid if statement to make code clearer.