fix !goat (also wasn't fully fixed)