again fix hotfix-2 (reverted from commit 9aba089ae00b74e512f8ba2b61cc006f0955730b)