Fix for https://github.com/buddycloud/buddycloud-xep/issues/5