attempt fix of #2893