fixing [#2361407]