Bind unbind mismatch fix#794

Closes #794 
yup, done