Added setup fix from kib branch