UPD: revert of path optimization