fixing ticket #1798