Changed the bugfix
Merge remote-tracking branch 'pr/3425' into merge3425
Included @dildick's suggested bugfix about paranthesis
Merge pull request #3499 from mark-grimes/pullRequest3425WithDildicksMod

Pull request #3425 with @dildick's modification