Extend unbind to max-1188