fix issue 335