Fixed as per issue comments, but also implemented for another 3 overloads
Merge pull request #198 from craigacronin/U4-1891

Fixed as per issue comments, but also implemented for another 3 overload...