Fix dependency placement