Hopefully fix parsing of options