Fixed error where tunnel values for option variables was not being
inserted correctly.