fix endpoint property resolution
Merge pull request #941 from ahgittin/fix/endpoint

fix endpoint property resolution