fixed dependency ordering