Minor code fix and apply the new option.