temp version that at least fixes a serious regression in previous revision