Fix for property observation