BUG: fix for incorrect option parsing