Fix support for multiple options