Bug fix regarding options