put back kludge - now i see where it's needed.