Fix OptionsHandler should handle options