Fixing EndPointProertyScope