fix scenario, own without property
merge origin/master