Bugfix for not supported options