Fixing unbind edge case