Patch to fix bug when using non-default options hash