Revert "fixing issue #7073"

This reverts commit d2b85cb3ab42c6ac5151018a943523de4767d2e7.
Revert "Revert "fixing issue #7073""

This reverts commit 195256857e2f73c38185ece484247e76b30423b9.