partially fixed serial build