Did he at least apologize after that? Sometimes being embarrassed like that can turn a person nice, but sometimes not.

Hopefully in the future he gives you less of a problem.