adding makeCurrent option
fixed dependency directory resolving