Add a temporary solution for options.wrap