Fix issue with new Options Framework