Finally fix dependencies issue.