Beaver & Rat fixed