Fixing  for long option with value