fix owner
merge fix