minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
