Fixing issue with originalOption;