#287 Fix property value persistence