bug fix (#5930)