fix issue 347