copied over kludge

copied over kludge... 2.9