fix evaluate and current path