kludge to try to avoid the merge problem