Option name parsing fixed