Making the change also work for windows