Issue 734 additional fix