[DF-4580] Bugfix