Try to simplify paths managment
Fixed issue with paths