better support for xep-0249