Fix 0.11.8

There was a problem with unbind from #232 under 0.11.8 losing the state too early, similar to what @rvagg experienced previously when updating to 0.11.8. This should fix that problem.