Bug fix - clear all existing options before setting new option