Just wondering why is this change needed?  I was able to make the use case work without this change.  This change also means that lines 310 and 312 will always get overwritten by the new value.