Fix issue with uninitialized options

 * Fix uninitialized options issue due to previous commit changes