fixed option handling when using commands