fix problems with parallel builds (second attempt)