added ownership check