some changes in resolve path method