Bug fix: Missing 'options' Object reference