Wolf-goat bug fix?