issue 734 additional fix