Should work without redefining add_options