Fixes JabbR/JabbR#887