This should be the final change for the Powershell version, I hope.