fix issue #5525