Fixes JabbR/JabbR#874