Fix handling of options

[#52175551]
[Delivers #52175551]

* options-52175551:
  Fix handling of options