Fix rabbit issue