Totally agree and this is likely the source of a few bugs in the current code.  Thanks!