Feature/i reactive notify property changed fix

Here's the probable fix for #664