Fix support for options