Generalize bug fix from #1512

Слиты xottab-duty запросил слияние github/fork/AMS21/generalize_1512 в dev

Created by: AMS21

This is a more generalized solution to the bug fix described in #1512 which requires less #ifdef and allows other places to also benefit from this fix.