fixing the kludge I made yesterday