Beaver follow bug hack-fix.