fixing another dependency ordering issue