Corrected issues with options #6