Hacked in solution to make it work with latest JabbR