fixed handling of extra* options