fixing [#2261813]