Fix to work with ejabberd master