disposeWhen occurs *before* re-evaulation
Merge pull request #1620 from AdamWillden/patch-1

disposeWhen occurs *before* re-evaulation