And can't we move that logic to the listener? If not, I don't think we have any other option than wrapping.. :(