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

Implemented the fix that had been committed against the issue and tested.