fixes issue #1951 cleanup