Fixes serious errors caused by new Rabbit