Yes, I think you are correct.  There will need to be a removeObserver before  line 322.  Should I add this as a commit to this pull request?