Fixing issue with option expansions.