Patch to consider modifications on Options class