Bugfix: dataset-based options are not working