Fix problem with trailing commas if using Option 2