Fix bug with handler_options