fix issue 437