Fix issues with the extract options method