issue 2123 fix