Ongoing to fix the bugs of options