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