pets: better fix than 64ac920 , and unsets beastmaster if wrongly set