dependency ordering fix