[#2292] Making tweaks per @WouterJ and changing method name