Linked properties fix 2