Fix additional option parsing bug

Can't believe I missed this the first time...

I tried but am unable to write a test for this, sorry. I am more confident in this final set of changes though.