Fix option parsing in 1.2.1