more kludge to avoid MERGE problem