fix issue 545