fix issue 363