make work with new build setup