Fix non-exists dir
Fix version conflict
Upd