Adjust for empty options