Little fix

This hack is not really clean, but seems to work.
Merge remote-tracking branch 'floren/patch-1' into develop

* floren/patch-1:
  Little fix