looks like we can do away with this kludge