patched for property duplicated