fix issue #5085